Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Fri, 8 Jan 2010 06:58:54 +0000 (07:58 +0100)
committerJan D. <jan.h.d@swipnet.se>
Fri, 8 Jan 2010 06:58:54 +0000 (07:58 +0100)

Trivial merge